Skip to content

Support hosted Java selectors in the release dispatcher #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SkyBlade1978 merged 1 commit into from
Sep 1, 2026
Merged

Support hosted Java selectors in the release dispatcher #274

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .github/workflows/deploy-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ jobs:
loader_display: ${{ steps.validate.outputs.loader_display }}
java_version: ${{ steps.validate.outputs.java_version }}
java_toolchain_version: ${{ steps.validate.outputs.java_toolchain_version }}
java_setup_version: ${{ steps.validate.outputs.java_setup_version }}
gradle_java_version: ${{ steps.validate.outputs.gradle_java_version }}
install_gradle_java: ${{ steps.validate.outputs.install_gradle_java }}
curseforge_project_id: ${{ steps.validate.outputs.curseforge_project_id }}
Expand Down Expand Up @@ -138,6 +139,7 @@ jobs:
loader_code="$(value loader_code)"
java_version="$(value java_version)"
java_toolchain_version="$(value java_toolchain_version)"
java_setup_version="$(value java_setup_version)"
gradle_java_version="$(value gradle_java_version)"
curseforge_project_id="$(value curseforge_project_id)"

Expand All @@ -149,6 +151,7 @@ jobs:
fi
done
java_toolchain_version="${java_toolchain_version:-$java_version}"
java_setup_version="${java_setup_version:-$java_toolchain_version}"

java_major() {
local version="$1"
Expand All @@ -164,6 +167,11 @@ jobs:
[[ "$toolchain_major" != "$2" ]]
}

if [[ "$(java_major "$java_setup_version")" != "$(java_major "$java_toolchain_version")" ]]; then
echo "Hosted Java selector $java_setup_version does not match toolchain $java_toolchain_version" >&2
exit 1
fi

java_setup_contracts=(
'8.0.502+7 17 true'
'16.0.2+7 17 true'
Expand Down Expand Up @@ -237,6 +245,7 @@ jobs:
echo "loader_display=$loader_display" >> "$GITHUB_OUTPUT"
echo "java_version=$java_version" >> "$GITHUB_OUTPUT"
echo "java_toolchain_version=$java_toolchain_version" >> "$GITHUB_OUTPUT"
echo "java_setup_version=$java_setup_version" >> "$GITHUB_OUTPUT"
echo "gradle_java_version=$gradle_java_version" >> "$GITHUB_OUTPUT"
echo "install_gradle_java=$install_gradle_java" >> "$GITHUB_OUTPUT"
echo "curseforge_project_id=$curseforge_project_id" >> "$GITHUB_OUTPUT"
Expand Down Expand Up @@ -282,7 +291,7 @@ jobs:
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
with:
distribution: temurin
java-version: ${{ needs.preflight.outputs.java_toolchain_version }}
java-version: ${{ needs.preflight.outputs.java_setup_version }}

- name: Install separate Java for Gradle
if: needs.preflight.outputs.install_gradle_java == 'true'
Expand Down Expand Up @@ -437,7 +446,7 @@ jobs:
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
with:
distribution: temurin
java-version: ${{ needs.preflight.outputs.java_toolchain_version }}
java-version: ${{ needs.preflight.outputs.java_setup_version }}

- name: Install separate Java for Gradle
if: needs.preflight.outputs.install_gradle_java == 'true'
Expand Down
Loading