From 99f38f84e33af09ed6edd4b8eb34e03c0c208d57 Mon Sep 17 00:00:00 2001 From: Arlind Sulejmani Date: Wed, 1 Oct 2025 13:53:42 +0200 Subject: [PATCH] test --- .gitea/workflows/actions/cleanup/action.yml | 4 ++-- .gitea/workflows/actions/discover-skins/action.yml | 14 ++++---------- .gitea/workflows/actions/prepare-assets/action.yml | 7 ++++--- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.gitea/workflows/actions/cleanup/action.yml b/.gitea/workflows/actions/cleanup/action.yml index 7b91f10..b35396d 100644 --- a/.gitea/workflows/actions/cleanup/action.yml +++ b/.gitea/workflows/actions/cleanup/action.yml @@ -3,7 +3,7 @@ description: "Remove leftover or outdated assets from repository" inputs: all_skins: - description: "Newline-delimited list of all skins" + description: "JSON array of all skins" required: true runs: @@ -15,7 +15,7 @@ runs: set -euo pipefail echo "[Cleanup Extra Files Started]" - readarray -t skins <<< "${{ inputs.all_skins }}" + readarray -t skins < <(echo '${{ inputs.all_skins }}' | jq -r '.[]') [ -f how-to-use.md ] && rm -f how-to-use.md [ -f src/replay.osr ] && rm -f src/replay.osr diff --git a/.gitea/workflows/actions/discover-skins/action.yml b/.gitea/workflows/actions/discover-skins/action.yml index ce5db2a..f4c0a87 100644 --- a/.gitea/workflows/actions/discover-skins/action.yml +++ b/.gitea/workflows/actions/discover-skins/action.yml @@ -16,7 +16,7 @@ outputs: description: "Path to file containing changed skins" value: ${{ steps.detect.outputs.changed_skins_file }} all_skins: - description: "All discovered skins (newline-delimited list)" + description: "All discovered skins (JSON array)" value: ${{ steps.discover_all.outputs.all_skins }} runs: @@ -31,14 +31,8 @@ runs: find "$SKINS_DIR" -mindepth 1 -maxdepth 1 -type d \ | sed 's|'"$SKINS_DIR"'/||' ) - # Write all skins to output - { - echo "all_skins<> "$GITHUB_OUTPUT" + json=$(printf '%s\n' "${skins[@]}" | jq -R . | jq -s .) + echo "all_skins=$json" >> "$GITHUB_OUTPUT" - name: Detect Changed Skin Directories id: detect @@ -46,7 +40,7 @@ runs: run: | echo "[Detect Changed Skin Directories Started]" - readarray -t all_skins <<< "${{ steps.discover_all.outputs.all_skins }}" + readarray -t all_skins < <(echo '${{ steps.discover_all.outputs.all_skins }}' | jq -r '.[]') force_rebuild="${{ inputs.force_rebuild }}" target_skins="${{ inputs.target_skins }}" diff --git a/.gitea/workflows/actions/prepare-assets/action.yml b/.gitea/workflows/actions/prepare-assets/action.yml index 6e5b5e1..2bcae38 100644 --- a/.gitea/workflows/actions/prepare-assets/action.yml +++ b/.gitea/workflows/actions/prepare-assets/action.yml @@ -3,12 +3,13 @@ description: "Setup environment dirs and create directories for assets" inputs: all_skins: - description: "Newline-delimited list of all skins" + description: "JSON array of all skins" required: true outputs: user_repository: description: "Path of the repository (relative inside container)" + value: ${{ steps.repo.outputs.user_repository }} runs: using: "composite" @@ -39,7 +40,7 @@ runs: echo "Creating base directories for assets..." mkdir -p "$REPO_SCREENSHOT_DIR" "$REPO_MOD_ICONS_DIR" "$REPO_RANKING_PANEL_DIR" "$OSK_PATH" "$REPO_THUMBNAIL_DIR" - while IFS= read -r skin; do + echo '${{ inputs.all_skins }}' | jq -r '.[]' | while IFS= read -r skin; do [ -z "$skin" ] && continue echo " → Creating subdirs for '$skin'…" mkdir -p \ @@ -48,7 +49,7 @@ runs: "$REPO_RANKING_PANEL_DIR/$skin" \ "$OSK_PATH/$skin" \ "$REPO_THUMBNAIL_DIR/$skin" - done <<< "${{ inputs.all_skins }}" + done echo "All asset directories created."