diff --git a/.github/scripts/plugin-artifact.py b/.github/scripts/plugin-artifact.py index 587ca45..c730186 100644 --- a/.github/scripts/plugin-artifact.py +++ b/.github/scripts/plugin-artifact.py @@ -15,8 +15,8 @@ def validate(source, version): target = Path.cwd().resolve() / "target" if not source.is_relative_to(target) or not source.is_file(): raise ValueError("Expected the Maven runtime JAR inside target/") - if not source.name.endswith(f"-{version}.jar"): - raise ValueError("Runtime JAR filename must end with the Maven version") + if not re.fullmatch(r"[a-z][a-z0-9]*-" + re.escape(version) + r"\.jar", source.name): + raise ValueError("Runtime JAR filename must use a lowercase alphanumeric name followed by the Maven version") with zipfile.ZipFile(source) as jar: descriptors = {"plugin.yml", "paper-plugin.yml"}.intersection(jar.namelist()) if not descriptors: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c3b478d..a7d5166 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: distribution: temurin java-version: '21' - name: Install shared plugin dependencies - uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@c19d797eb3565838790089af59e5e5028fc56576 + uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@2eefce8d0d648a3c9a2587d64274691086135821 with: mode: pinned diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index 0bc096b..c464c08 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -47,7 +47,7 @@ jobs: [[ "${TAG^^}" != *SNAPSHOT* ]] || exit 1 - name: Install shared plugin dependencies - uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@c19d797eb3565838790089af59e5e5028fc56576 + uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@2eefce8d0d648a3c9a2587d64274691086135821 with: mode: pinned diff --git a/pom.xml b/pom.xml index 9f8bc2e..fea2310 100644 --- a/pom.xml +++ b/pom.xml @@ -6,12 +6,12 @@ net.tfminecraft cooking - 0.2.1-ALPHA + 0.2.1 21 UTF-8 - 0.2.0-BETA + 0.2.0 2.0.1 3.0.1 2.0.0