From b145bddf07e83c7927e93a7c81aa98b23871232c Mon Sep 17 00:00:00 2001
From: Craig Raw <craigraw@gmail.com>
Date: Thu, 5 Feb 2026 11:22:24 +0200
Subject: [PATCH] combine sdkman and setup-java actions

---
 .github/workflows/package.yaml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
index 7a613266..5fbad8e8 100644
--- a/.github/workflows/package.yaml
+++ b/.github/workflows/package.yaml
@@ -15,10 +15,22 @@ jobs:
       - uses: actions/checkout@v6
         with:
           submodules: recursive
-      - name: Set up SDKman and Java
-        uses: sdkman/sdkman-action@main
+      - name: Download JDK via SDKMAN
+        id: sdkman
+        run: |
+          curl -s "https://get.sdkman.io" | bash
+          source "$HOME/.sdkman/bin/sdkman-init.sh"
+          sdk env install
+          JAVA_VERSION=$(grep '^java=' .sdkmanrc | cut -d= -f2)
+          ARCHIVE=$(ls ~/.sdkman/archives/java-${JAVA_VERSION}.*)
+          echo "file=$ARCHIVE" >> $GITHUB_OUTPUT
+          echo "version=$(echo $JAVA_VERSION | cut -d- -f1)" >> $GITHUB_OUTPUT
+
+      - uses: actions/setup-java@v5
         with:
-          sdkmanrc: .sdkmanrc
+          distribution: 'jdkfile'
+          java-version: ${{ steps.sdkman.outputs.version }}
+          jdkFile: ${{ steps.sdkman.outputs.file }}
       - name: Show Build Versions
         run: ./gradlew -v
       - name: Build with Gradle