From 2e4e18c9e706e801548f05e128dbfd7868e5db5e Mon Sep 17 00:00:00 2001 From: plasmagoat Date: Mon, 9 Jun 2025 21:20:42 +0200 Subject: [PATCH] small fixes --- .forgejo/workflows/build-image.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml index 48fdf76..cd899a0 100644 --- a/.forgejo/workflows/build-image.yml +++ b/.forgejo/workflows/build-image.yml @@ -119,9 +119,11 @@ jobs: | to_entries[] | select(.key != "root") | "* \(.key): \(.value.locked.url // ("github:\(.value.locked.owner)/\(.value.locked.repo)")) @ \(.value.locked.rev)" - ' <<< "$(cat metadata.json)" | sed ':a;N;$!ba;s/\n/\\n/g') + ' <<< "$(nix flake metadata --json)") - echo "metadata=$META" >> "$GITHUB_OUTPUT" + echo "metadata<> "$GITHUB_OUTPUT" + echo "$META" >> "$GITHUB_OUTPUT" + echo "EOF" >> "$GITHUB_OUTPUT" - name: Upload Release Artifact id: release-artifact @@ -136,7 +138,7 @@ jobs: uses: forgejo/upload-artifact@v4 if: ${{ steps.build_image.outputs.image_path_from_build }} with: - name: build-artifact + name: image-artifact path: ${{ steps.build_image.outputs.image_path_from_build }} release: @@ -179,7 +181,8 @@ jobs: **🔗 Build Results:** [View Build Logs](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_number }}) - [Download Build Artifact](${{ needs.build.outputs.image-url }}) + [Download Image](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_number }}/artifact/image-artifact) + [Download Image (action generated url)](${{ needs.build.outputs.image-url }}) **🔐 Flake Revision:** `${{ github.sha }}`