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 fbac9c4..c080787 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: cache: maven - name: Install shared plugin dependencies - uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@c19d797eb3565838790089af59e5e5028fc56576 + uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@4f7a3545063cb2e8d06a034687c817ab863f0835 with: mode: pinned diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index b882b37..15ead7f 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -37,7 +37,7 @@ jobs: java-version: ${{ inputs.java-version }} - name: Install shared plugin dependencies - uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@c19d797eb3565838790089af59e5e5028fc56576 + uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@4f7a3545063cb2e8d06a034687c817ab863f0835 with: mode: pinned diff --git a/pom.xml b/pom.xml index c1bc687..bf3857f 100644 --- a/pom.xml +++ b/pom.xml @@ -71,6 +71,7 @@ + geigercounters-${project.version} src/main/resources