From 4b8d6f22419b38e12d251c14748e3db7185d01f7 Mon Sep 17 00:00:00 2001
From: Moody Liu <mooodyhunter@outlook.com>
Date: Sat, 3 Aug 2024 23:02:32 +0100
Subject: [PATCH] ci: refine

---
 .github/workflows/build-mos.yml | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build-mos.yml b/.github/workflows/build-mos.yml
index 5b863b84..054ef936 100644
--- a/.github/workflows/build-mos.yml
+++ b/.github/workflows/build-mos.yml
@@ -15,19 +15,8 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {
-              "name": "x86_64 limine",
-              "arch": "x86_64",
-              "target": "mos_limine",
-              "compile_only": "OFF",
-            }
-          - {
-              "name": "RISC-V limine",
-              "arch": "riscv64",
-              "target": "mos_limine",
-              "artifact": "mos_limine.elf",
-              "compile_only": "ON",
-            }
+          - { "name": "x86_64 limine", "arch": "x86_64", "compile_only": "OFF" }
+          - { "name": "RISC-V limine", "arch": "riscv64", "compile_only": "ON" }
         build_type: [Debug, Release]
 
     steps:
@@ -47,6 +36,7 @@ jobs:
           echo 'Server = https://repo.mooody.me/$repo/$arch' >> /etc/pacman.conf
 
           pacman -Sy --noconfirm rustup mos-sdk ${{matrix.config.arch}}-mos-gcc ${{matrix.config.arch}}-mos-binutils ${{matrix.config.arch}}-mos-mlibc mos-llvm mos-rust
+          pacman -Sy --noconfirm python-ptyprocess
 
           rustup toolchain link mosdev /opt/mos-rust/
           rustup default mosdev
@@ -65,7 +55,7 @@ jobs:
       - name: Build
         run: |
           cd build
-          ninja ${{matrix.config.target}} mos_initrd
+          ninja mos_uefi_partition
 
       - name: Test
         if: ${{matrix.config.compile_only}} == "OFF"
@@ -76,11 +66,5 @@ jobs:
       - name: Upload Bootable Artifact
         uses: actions/upload-artifact@v4.3.5
         with:
-          name: MOS-${{matrix.config.target}}-${{matrix.build_type}}-${{matrix.config.arch}}
+          name: MOS-${{matrix.build_type}}-${{matrix.config.arch}}
           path: build/uefi-files
-
-      - name: Upload initrd
-        uses: actions/upload-artifact@v4.3.5
-        with:
-          name: MOS-${{matrix.config.target}}-${{matrix.build_type}}-${{matrix.config.arch}}-initrd
-          path: build/initrd.cpio