From 193219134222be8f75067b7fa6c78d5ae33d6703 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Thu, 12 Nov 2026 22:10:50 +0000 Subject: [PATCH] Support the approved Forge 26.2 release target --- .github/maven-release/README.md | 4 ++-- .github/maven-release/test_verify.py | 4 ++-- .github/maven-release/verify.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/maven-release/README.md b/.github/maven-release/README.md index 588f173..ad485e2 100644 --- a/.github/maven-release/README.md +++ b/.github/maven-release/README.md @@ -14,8 +14,8 @@ Start a new run with the recorded CurseForge file ID so it verifies that upload without submitting the jar again. The release workflow sets Java 8 through Minecraft 1.16.5, Java 16 for Minecraft 1.17.1, and Java 17 for Minecraft 1.18.2 through 1.20.1, Java 21 for Minecraft 1.20.6, 1.21.1 and 1.21.11, and Java 25 -for Minecraft 26.1.2. The pure target helper in verify.py uses an explicit -whitelist; unqualified targets, including 26.2, are rejected. +for Minecraft 26.1.2 and 26.2. The pure target helper in verify.py uses an +explicit whitelist; unqualified targets, including 26.3, are rejected. The dispatcher runs its offline tests before staging an artifact. Release records still require the actual merged source, successful version-branch CI diff --git a/.github/maven-release/test_verify.py b/.github/maven-release/test_verify.py index d2ae018..a39b41c 100644 --- a/.github/maven-release/test_verify.py +++ b/.github/maven-release/test_verify.py @@ -16,14 +16,14 @@ def test_released_minecraft_lines_keep_their_runtime(self): 16: ("1.17.1",), 17: ("1.18.2", "1.19.4", "1.20.1"), 21: ("1.20.6", "1.21.1", "1.21.11"), - 25: ("26.1.2",), + 25: ("26.1.2", "26.2"), }.items(): for version in versions: with self.subTest(version=version): self.assertEqual((version, f"Java {java}"), verify.release_target(f"master-{version}")) def test_unqualified_or_malformed_targets_are_rejected(self): - for branch in ("master-26.2", "master-26.2.0", "master-26.1.1", "master-26.1.3", + for branch in ("master-26.3", "master-26.2.0", "master-26.1.1", "master-26.1.3", "master-1.21.12", "master-26.1.2-extra", "feature/26.1.2", "26.1.2", "master-main", "master-26.1.2\n"): with self.subTest(branch=branch), self.assertRaises(ValueError): diff --git a/.github/maven-release/verify.py b/.github/maven-release/verify.py index fda046d..7c50d41 100644 --- a/.github/maven-release/verify.py +++ b/.github/maven-release/verify.py @@ -34,7 +34,7 @@ def release_target(branch): "1.10.2": 8, "1.12.2": 8, "1.13.2": 8, "1.14.4": 8, "1.15.2": 8, "1.16.5": 8, "1.17.1": 16, "1.18.2": 17, "1.19.4": 17, "1.20.1": 17, "1.20.6": 21, "1.21.1": 21, - "1.21.11": 21, "26.1.2": 25, + "1.21.11": 21, "26.1.2": 25, "26.2": 25, } require(minecraft in java_versions, f"Unsupported Minecraft version: {minecraft}") return minecraft, f"Java {java_versions[minecraft]}"