Merge branch 'main' into feature/book-front-cover-10120

Author: Siedlerchr

.github/workflows/binaries.yml

@@ -67,69 +67,119 @@ jobs:
         run: |
           if [[ "$GITHUB_WORKFLOW" == *"early access"* && "$REPO_OWNER" != "JabRef" ]]; then
             echo "🚫 Early access workflow for JabRef disabled for non-JabRef owner"
+            echo "🚫 Early access workflow for JabRef disabled for non-JabRef owner" >> $GITHUB_STEP_SUMMARY
             echo "should-build=false" >> "$GITHUB_OUTPUT"
             exit 0
           fi
 
           if [[ "$EVENT_NAME" != "labeled" || "$LABEL_NAME" == "automerge"  || "$LABEL_NAME" == "dev: binaries" ]]; then
             echo "📦 build enabled"
+            echo "📦 build enabled" >> $GITHUB_STEP_SUMMARY
             echo "should-build=true" >> "$GITHUB_OUTPUT"
           else
             echo "🚫 build should be skipped"
+            echo "🚫 build should be skipped" >> $GITHUB_STEP_SUMMARY
             echo "should-build=false" >> "$GITHUB_OUTPUT"
             exit 0
           fi
 
           if [ -z "$BUILDJABREFPRIVATEKEY" ]; then
+            echo "🚫 Secret BUILDJABREFPRIVATEKEY not present – skipping upload"
+            echo "🚫 Secret BUILDJABREFPRIVATEKEY not present – skipping upload"
             echo "upload-to-builds-jabref-org=false" >> "$GITHUB_OUTPUT"
             echo "secretspresent=false" >> "$GITHUB_OUTPUT"
-            echo "🚫 Secret BUILDJABREFPRIVATEKEY not present – skipping upload"
             exit 0
           fi
           echo "secretspresent=true" >> "$GITHUB_OUTPUT"
 
           if [[ "$GITHUB_REF" == refs/heads/gh-readonly-queue* ]]; then
-            echo "upload-to-builds-jabref-org=false" >> "$GITHUB_OUTPUT"
             echo "🚫 merge queue – skipping upload"
+            echo "🚫 merge queue – skipping upload" >> $GITHUB_STEP_SUMMARY
+            echo "upload-to-builds-jabref-org=false" >> "$GITHUB_OUTPUT"
             exit 0
           fi
 
           if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
+            echo "tag bulid" >> $GITHUB_STEP_SUMMARY
             echo "tagbuild=true" >> "$GITHUB_OUTPUT"
           else
+            echo "no tag bulid" >> $GITHUB_STEP_SUMMARY
             echo "tagbuild=false" >> "$GITHUB_OUTPUT"
           fi
 
           if [[ "${GITHUB_REF}" == refs/tags/* ]] || [[ "${{ inputs.notarization }}" == "true" ]]; then
             # This workflow runs on ubuntu-latest even for notarization for macOS; need to check later if really on macOS
              echo "🧾 macOS notarization"
+             echo "🧾 macOS notarization" >> $GITHUB_STEP_SUMMARY
              echo "should-notarize=true" >> "$GITHUB_OUTPUT"
              echo "☁️ will upload"
+             echo "☁️ will upload" >> $GITHUB_STEP_SUMMARY
              echo "upload-to-builds-jabref-org=true" >> "$GITHUB_OUTPUT"
              exit 0;
           else
             echo "🚫 no macOS notarization"
+            echo "🚫 no macOS notarization" >> $GITHUB_STEP_SUMMARY
             echo "should-notarize=false" >> "$GITHUB_OUTPUT"
           fi
 
           if [ "${{ github.event_name }}" != "pull_request" ]; then
-            echo "upload-to-builds-jabref-org=true" >> "$GITHUB_OUTPUT"
             echo "☁️ Non-PR event – will upload"
+            echo "☁️ Non-PR event – will upload" >> $GITHUB_STEP_SUMMARY
+            echo "upload-to-builds-jabref-org=true" >> "$GITHUB_OUTPUT"
             exit 0
           fi
 
           LABELS=$(gh api repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/labels --jq '.[].name')
 
           if echo "$LABELS" | grep -q "^dev: binaries$"; then
-            echo "upload-to-builds-jabref-org=true" >> "$GITHUB_OUTPUT"
             echo "☁️ Label 'dev: binaries' found – will upload"
+            echo "☁️ Label 'dev: binaries' found – will upload" >> $GITHUB_STEP_SUMMARY
+            echo "upload-to-builds-jabref-org=true" >> "$GITHUB_OUTPUT"
           else
-            echo "upload-to-builds-jabref-org=false" >> "$GITHUB_OUTPUT"
             echo "🚫 Label 'dev: binaries' not found – skipping upload"
+            echo "🚫 Label 'dev: binaries' not found – skipping upload" >> $GITHUB_STEP_SUMMARY
+            echo "upload-to-builds-jabref-org=false" >> "$GITHUB_OUTPUT"
+          fi
+
+  disk-space-check:
+    needs: conditions
+    runs-on: ubuntu-latest
+    outputs:
+      available: ${{ steps.diskspace.outputs.available }}
+    steps:
+      - name: No upload
+        if: needs.conditions.outputs.upload-to-builds-jabref-org == 'false'
+        shell: bash
+        run: |
+          echo "🚫 no upload – skipping upload"
+          echo "🚫 no upload – skipping upload" >> $GITHUB_STEP_SUMMARY
+          echo "available=false" >> "$GITHUB_OUTPUT"
+      - name: Setup SSH key
+        if: needs.conditions.outputs.upload-to-builds-jabref-org == 'true'
+        run: |
+          echo "${{ secrets.buildJabRefPrivateKey }}" > sshkey
+          chmod 600 sshkey
+      - name: Check disk space on builds.jabref.org
+        if: needs.conditions.outputs.upload-to-builds-jabref-org == 'true'
+        shell: bash
+        run: |
+          USAGE=$(ssh -p 9922 -i sshkey -o StrictHostKeyChecking=no [email protected] \
+            "df --output=pcent /var/www/builds.jabref.org | tail -n1 | tr -dc '0-9'")
+          echo "Remote usage: ${USAGE}%"
+          echo "Remote usage: ${USAGE}%" >> $GITHUB_STEP_SUMMARY
+
+          if [ "$USAGE" -lt 80 ]; then
+            echo "☁️ enough disk space available – will upload"
+            echo "☁️ enough disk space available – will upload" >> $GITHUB_STEP_SUMMARY
+            echo "available=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "🚫 not enough disk space – skipping upload"
+            echo "🚫 not enough disk space – skipping upload" >> $GITHUB_STEP_SUMMARY
+            echo "available=false" >> "$GITHUB_OUTPUT"
           fi
 
   build:
-    needs: [conditions]
+    needs: [conditions, disk-space-check]
     if: ${{ needs.conditions.outputs.should-build == 'true' }}
     strategy:
       fail-fast: false
@@ -281,62 +331,49 @@ jobs:
 
       # region Upload to builds.jabref.org / GitHub artifacts store
       - name: Setup SSH key
-        if: (needs.conditions.outputs.upload-to-builds-jabref-org == 'true')
+        if: ${{ needs.disk-space-check.available == 'true' }}
         run: |
           echo "${{ secrets.buildJabRefPrivateKey }}" > sshkey
           chmod 600 sshkey
-      - name: Check disk space on builds.jabref.org
-        if: (needs.conditions.outputs.upload-to-builds-jabref-org == 'true')
-        id: diskspace
-        shell: bash
-        run: |
-          USAGE=$(ssh -p 9922 -i sshkey -o StrictHostKeyChecking=no [email protected] \
-            "df --output=pcent /var/www/builds.jabref.org | tail -n1 | tr -dc '0-9'")
-          echo "Remote usage: $USAGE%"
-          if [ "$USAGE" -lt 90 ]; then
-            echo "available=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "available=false" >> "$GITHUB_OUTPUT"
-          fi
       - name: Setup rsync (macOS)
-        if: ${{ (steps.diskspace.outputs.available == 'true') && (startsWith(matrix.os, 'macos') && (needs.conditions.outputs.upload-to-builds-jabref-org == 'true')) }}
+        if: ${{ (needs.disk-space-check.available == 'true') && (startsWith(matrix.os, 'macos') && (needs.conditions.outputs.upload-to-builds-jabref-org == 'true')) }}
         run: brew install rsync
       - name: Setup rsync (Windows)
-        if: ${{ (steps.diskspace.outputs.available == 'true') && (matrix.os == 'windows-latest') }}
+        if: ${{ (needs.disk-space-check.available == 'true') && (matrix.os == 'windows-latest') }}
         # We want to have rsync available at this place to avoid uploading and downloading from GitHub artifact store (taking > 5 minutes in total)
         # We cannot use "action-rsyncer", because that requires Docker which is unavailable on Windows
         # We cannot use "setup-rsync", because that does not work on Windows
         # We do not use egor-tensin/setup-cygwin@v4, because it replaces the default shell
         # We need to use v6.4.4 as v6.4.5 misses "lib\rsync\tools\bin\ssh.exe"
         run: choco install rsync --version=6.4.4
       - name: Upload jabgui to builds.jabref.org (Windows)
-        if: ${{ (steps.diskspace.outputs.available == 'true') && (matrix.os == 'windows-latest') }}
+        if: ${{ (needs.disk-space-check.available == 'true') && (matrix.os == 'windows-latest') }}
         shell: cmd
         # for rsync installed by chocolatey, we need the ssh.exe delivered with that installation
         run: |
           rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'C:\ProgramData\chocolatey\lib\rsync\tools\bin\ssh.exe -p 9922 -i sshkey -o StrictHostKeyChecking=no' jabgui/build/packages/${{ matrix.os }}/ [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/ || true
       - name: Upload jabkkit to builds.jabref.org (Windows)
-        if: ${{ (steps.diskspace.outputs.available == 'true') && (matrix.os == 'windows-latest') }}
+        if: ${{ (needs.disk-space-check.available == 'true') && (matrix.os == 'windows-latest') }}
         shell: cmd
         run: |
           rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'C:\ProgramData\chocolatey\lib\rsync\tools\bin\ssh.exe -p 9922 -i sshkey -o StrictHostKeyChecking=no' jabkit/build/packages/${{ matrix.os }}/ [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/ || true
       - name: Upload jabls-cli to builds.jabref.org (Windows)
-        if: ${{ (steps.diskspace.outputs.available == 'true') && (matrix.os == 'windows-latest') }}
+        if: ${{ (needs.disk-space-check.available == 'true') && (matrix.os == 'windows-latest') }}
         shell: cmd
         run: |
           rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'C:\ProgramData\chocolatey\lib\rsync\tools\bin\ssh.exe -p 9922 -i sshkey -o StrictHostKeyChecking=no' jabls-cli/build/packages/${{ matrix.os }}/ [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/ || true
       - name: Upload jabgui to builds.jabref.org (linux, macOS)
-        if: ${{ (steps.diskspace.outputs.available == 'true') && ((startsWith(matrix.os, 'macos') && (needs.conditions.outputs.should-notarize != 'true')) || startsWith(matrix.os, 'ubuntu')) }}
+        if: ${{ (needs.disk-space-check.available == 'true') && ((startsWith(matrix.os, 'macos') && (needs.conditions.outputs.should-notarize != 'true')) || startsWith(matrix.os, 'ubuntu')) }}
         shell: bash
         run: |
           rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'ssh -p 9922 -i sshkey -o StrictHostKeyChecking=no' jabgui/build/packages/${{ matrix.os }}/ [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/ || true
       - name: Upload jabkit to builds.jabref.org (linux, macOS)
-        if: ${{ (steps.diskspace.outputs.available == 'true') && (startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')) }}
+        if: ${{ (needs.disk-space-check.available == 'true') && (startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')) }}
         shell: bash
         run: |
           rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'ssh -p 9922 -i sshkey -o StrictHostKeyChecking=no' jabkit/build/packages/${{ matrix.os }}/ [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/ || true
       - name: Upload jabls-cli to builds.jabref.org (linux, macOS)
-        if: ${{ (steps.diskspace.outputs.available == 'true') && (startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')) }}
+        if: ${{ (needs.disk-space-check.available == 'true') && (startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')) }}
         shell: bash
         run: |
           rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'ssh -p 9922 -i sshkey -o StrictHostKeyChecking=no' jabls-cli/build/packages/${{ matrix.os }}/ [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/ || true

.jbang/JabKitLauncher.java

@@ -5,21 +5,21 @@
 //JAVA 24
 //RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED
 
-//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/converter/CygWinPathConverter.java
-//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/ArgumentProcessor.java
-//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/CheckConsistency.java
-//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/CheckIntegrity.java
-//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/Convert.java
-//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/DoiToBibtex.java
-//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/Fetch.java
-//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/GenerateBibFromAux.java
-//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/GenerateCitationKeys.java
-//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/Pdf.java
-//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/PdfUpdate.java
-//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/Preferences.java
-//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/Pseudonymize.java
-//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/Search.java
-//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/JabKit.java
+//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/converter/CygWinPathConverter.java
+//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/commands/JabKit.java
+//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/commands/CheckConsistency.java
+//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/commands/CheckIntegrity.java
+//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/commands/Convert.java
+//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/commands/DoiToBibtex.java
+//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/commands/Fetch.java
+//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/commands/GenerateBibFromAux.java
+//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/commands/GenerateCitationKeys.java
+//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/commands/Pdf.java
+//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/commands/PdfUpdate.java
+//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/commands/Preferences.java
+//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/commands/Pseudonymize.java
+//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/commands/Search.java
+//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/JabKitLauncher.java
 //FILES tinylog.properties=../jabkit/src/main/resources/tinylog.properties
 
 // raw is for https://github.com/unicode-org/icu/pull/2127
@@ -33,6 +33,6 @@
 /// This class is required for [jbang](https://www.jbang.dev/)
 public class JabKitLauncher {
     public static void main(String[] args) {
-        org.jabref.toolkit.JabKit.main(args);
+        org.jabref.toolkit.JabKitLauncher.main(args);
     }
 }