PDF review

Author: carlosevia

action.yml

@@ -50,12 +50,12 @@ runs:
         distribution: temurin
         java-version: ${{ inputs.java-version }}
 
-    # Cache the plus-fop bundle by exact version
+    # Cache the plus-fop bundle by version (folder name may vary; cache pattern uses a glob)
     - name: Restore ditac (plus-fop) cache
       id: cache-ditac
       uses: actions/cache@v4
       with:
-        path: ditac-${{ inputs.ditac-version }}-plus-fop*
+        path: ditac-${{ inputs.ditac-version }}*
         key: ditac-${{ inputs.ditac-version }}-plus-fop
 
     - name: Download ditac (plus-fop)
@@ -69,20 +69,28 @@ runs:
         curl -fsSL -o ditac.zip "$URL"
         unzip -q ditac.zip
         rm -f ditac.zip
+        echo "Top-level after unzip:"
+        ls -lah
 
-    - name: Locate ditac directory and add to PATH
+    - name: Locate ditac directory and add to PATH (robust)
       shell: bash
       run: |
         set -euo pipefail
-        DITAC_DIR="$(find . -maxdepth 1 -type d -name "ditac-${{ inputs.ditac-version }}-plus-fop*" | head -n1)"
-        if [[ -z "${DITAC_DIR:-}" ]]; then
-          echo "Could not find ditac directory after unzip." >&2
+        # Find the actual ditac launcher regardless of folder naming
+        CANDIDATE="$(find "$GITHUB_WORKSPACE" -maxdepth 3 -type f -path "*/bin/ditac" | head -n1 || true)"
+        if [[ -z "${CANDIDATE:-}" ]]; then
+          echo "Could not find bin/ditac after unzip." >&2
+          echo "Workspace tree for debugging:" >&2
+          ls -R || true
           exit 1
         fi
-        echo "Using $DITAC_DIR"
+        DITAC_DIR="$(dirname "$(dirname "$CANDIDATE")")"
+        echo "Using ditac in: $DITAC_DIR"
         echo "DITAC_DIR=$DITAC_DIR" >> "$GITHUB_ENV"
-        echo "$GITHUB_WORKSPACE/$DITAC_DIR/bin" >> "$GITHUB_PATH"
-        ditac -version || true
+        # Ensure executable bit (some zips can drop it)
+        chmod +x "$DITAC_DIR/bin/ditac" || true
+        echo "$DITAC_DIR/bin" >> "$GITHUB_PATH"
+        "$DITAC_DIR/bin/ditac" -version || true
 
     - name: Ensure directories
       shell: bash