From bf93b8af15796752e890a921d8ccf12091058d94 Mon Sep 17 00:00:00 2001
From: Yukari Chiba <i@0x7f.cc>
Date: Wed, 17 Apr 2024 13:20:22 +0800
Subject: [PATCH] Update publish_iso.yml

---
 .github/workflows/publish_iso.yml | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish_iso.yml b/.github/workflows/publish_iso.yml
index a712513..9db973d 100644
--- a/.github/workflows/publish_iso.yml
+++ b/.github/workflows/publish_iso.yml
@@ -11,6 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         arch: [x86_64, aarch64, riscv64]
+        variant: [liveimage-desktop, liveimage-minimal, tarball]
         include:
           - arch: x86_64
             debarch: amd64
@@ -19,6 +20,7 @@ jobs:
           - arch: riscv64
             debarch: riscv64
     runs-on: ubuntu-latest
+    name: Generate ISO for ${{ matrix.variant }} - ${{ matrix.arch }}
     steps:
       - uses: actions/checkout@v3
       - name: Set up QEMU
@@ -36,12 +38,25 @@ jobs:
         run: |
           wget https://raw.githubusercontent.com/eweOS/packages/pacman/pacman.conf -O pacman.ewe.conf
           sed -i 's/os-repo.ewe.moe/os-repo-bak.ewe.moe/' pacman.ewe.conf
-      - name: Build ISO for ${{ matrix.arch }}
+      - name: Build ISO for ${{ matrix.variant }} - ${{ matrix.arch }}
         run: |
-          ./gen.sh liveimage-minimal ${{ matrix.arch }}
-      - name: Upload artifact
+          ./gen.sh ${{ matrix.variant }} ${{ matrix.arch }}
+      - name: Check build Results
+        id: buildresult
+        run: |
+          ls results/ | grep -v .sha256
+          ls results/ | grep .sha256
+          echo "ART_FILE=$(ls results/ | grep -v .sha256 | head -n 1)" >> $GITHUB_OUTPUT
+          echo "ART_SUM=$(ls results/ | grep .sha256 | head -n 1)" >> $GITHUB_OUTPUT
+      - name: Upload artifact (file)
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{steps.buildresult.outputs.ART_FILE}}
+          path: results/${{steps.build.outputs.ART_FILE}}
+          compression-level: 0
+      - name: Upload artifact (checksum)
         uses: actions/upload-artifact@v4
         with:
-          name: eweos-${{ matrix.arch }}
-          path: results
+          name: ${{steps.buildresult.outputs.ART_SUM}}
+          path: results/${{steps.build.outputs.ART_SUM}}
           compression-level: 0