diff --git a/.github/maven-release/README.md b/.github/maven-release/README.md index 79d7cc2..43820f8 100644 --- a/.github/maven-release/README.md +++ b/.github/maven-release/README.md @@ -13,7 +13,10 @@ If CurseForge has accepted the file but it isn't public yet, wait for approval. 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, and Java 21 for Minecraft 1.20.6 and 1.21.1. +through 1.20.1, and Java 21 for Minecraft 1.20.6, 1.21.1 and 1.21.11. + +The GitHub release targets the exact version-branch source recorded in +`releases.json`, not the publication workflow's default branch. Before publishing, check that basePower and Base Metals have public files before publishing. Use the release's required dependency relations on CurseForge. diff --git a/.github/maven-release/releases.json b/.github/maven-release/releases.json index e49406a..8041570 100644 --- a/.github/maven-release/releases.json +++ b/.github/maven-release/releases.json @@ -106,6 +106,15 @@ "archiveSha256": "7b7ddfc9d22def525aee024cce64a8863947c3ae0e061338d51beaaecbf0e2fd", "mainSha256": "ea305b9060bc2a84021c7299249aa79aa593ea8a37665c18d0b3483902f1046a" }, + "2.2.16.121111": { + "branch": "master-1.21.11", + "commit": "ce1601aa6c9f13649ac8ee0b05c4d6c01ef7406e", + "tag": "2.2.16.121111", + "runId": 43132026555, + "artifactId": 13906186442, + "archiveSha256": "e4cc3027ea0cb229e3d6f0ec566c352833b19b9e7cd75bb58351f3f1511cf2ab", + "mainSha256": "f23ddc4abb36a1c4c7a4205151fbb6ddfd25397e86909e1c0b146c4089b747e0" + }, "2.2.14.120061": { "branch": "master-1.20.6", "commit": "eb48cccc52d07ce3ae9cedca49216c788c2fb735", diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml index ff27370..dd4a373 100644 --- a/.github/workflows/deploy-release.yml +++ b/.github/workflows/deploy-release.yml @@ -74,7 +74,7 @@ jobs: 1.10.2|1.12.2|1.13.2|1.14.4|1.15.2|1.16.5) java="Java 8" ;; 1.17.1) java="Java 16" ;; 1.18.2|1.19.4|1.20.1) java="Java 17" ;; - 1.20.6|1.21.1) java="Java 21" ;; + 1.20.6|1.21.1|1.21.11) java="Java 21" ;; *) echo "Unsupported Minecraft version for this publisher: $mc" >&2; exit 1 ;; esac echo "minecraft=$mc" >> "$GITHUB_OUTPUT" @@ -150,6 +150,8 @@ jobs: run: | set -euo pipefail python3 .github/maven-release/verify.py verify "$RELEASE_VERSION" "$RELEASE_WORK" | tee -a "$GITHUB_STEP_SUMMARY" - gh release create "$RELEASE_VERSION" --verify-tag \ + target=$(jq -er --arg v "$RELEASE_VERSION" '.releases[$v].commit' .github/maven-release/releases.json) + [[ "$target" =~ ^[0-9a-f]{40}$ ]] + gh release create "$RELEASE_VERSION" --verify-tag --target "$target" \ --title "baseSteam $RELEASE_VERSION" --notes-file "$RELEASE_WORK/release-notes.txt" \ "$RELEASE_WORK/"*.jar