From acca36c3a38d64749595ec5b9104b875803fd136 Mon Sep 17 00:00:00 2001 From: littlecodedragon <253116839+littlecodedragon@users.noreply.github.com> Date: Mon, 27 Apr 2026 06:41:24 +0200 Subject: [PATCH] Harden JDK package-manager detection in Forgejo release job. Log PATH and package manager probes, check common absolute binary locations, and keep workflow free of control bytes for Forgejo parsing. --- .forgejo/workflows/build_release.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/build_release.yml b/.forgejo/workflows/build_release.yml index 076407565..e769faa67 100755 --- a/.forgejo/workflows/build_release.yml +++ b/.forgejo/workflows/build_release.yml @@ -46,14 +46,16 @@ jobs: if command -v java >/dev/null 2>&1; then java -version else - if command -v dnf >/dev/null 2>&1; then + echo "PATH=$PATH" + echo "pkg managers: dnf=$(command -v dnf || true) apt=$(command -v apt-get || true) apk=$(command -v apk || true) pacman=$(command -v pacman || true)" + if [ -x /usr/bin/dnf ] || command -v dnf >/dev/null 2>&1; then pkg_install dnf install -y java-17-openjdk-devel - elif command -v apt-get >/dev/null 2>&1; then + elif [ -x /usr/bin/apt-get ] || command -v apt-get >/dev/null 2>&1; then pkg_install apt-get update pkg_install apt-get install -y openjdk-17-jdk - elif command -v apk >/dev/null 2>&1; then + elif [ -x /sbin/apk ] || [ -x /usr/sbin/apk ] || command -v apk >/dev/null 2>&1; then pkg_install apk add --no-cache openjdk17 - elif command -v pacman >/dev/null 2>&1; then + elif [ -x /usr/bin/pacman ] || command -v pacman >/dev/null 2>&1; then pkg_install pacman -Sy --noconfirm jdk17-openjdk else echo "No supported package manager found for JDK installation."