From fe2c37fcf92c109d72fefa361891c5ff1b3306a4 Mon Sep 17 00:00:00 2001
From: madonuko <madonuko@outlook.com>
Date: Sat, 9 Nov 2024 13:01:56 +0800
Subject: [PATCH] fix stuff

---
 .github/workflows/build-katsu.yml              | 18 ++++++++++++++----
 .../flagship.yaml => flagship-x86_64.yaml}     |  0
 .../{x86_64/gnome.yaml => gnome-x86_64.yaml}   |  0
 .../{x86_64/kde.yaml => plasma-x86_64.yaml}    |  0
 .../{x86_64/xfce.yaml => xfce-x86_64.yaml}     |  0
 5 files changed, 14 insertions(+), 4 deletions(-)
 rename katsu/modules/ports/chromebook/{x86_64/flagship.yaml => flagship-x86_64.yaml} (100%)
 rename katsu/modules/ports/chromebook/{x86_64/gnome.yaml => gnome-x86_64.yaml} (100%)
 rename katsu/modules/ports/chromebook/{x86_64/kde.yaml => plasma-x86_64.yaml} (100%)
 rename katsu/modules/ports/chromebook/{x86_64/xfce.yaml => xfce-x86_64.yaml} (100%)

diff --git a/.github/workflows/build-katsu.yml b/.github/workflows/build-katsu.yml
index e3045f6..cee6ddf 100644
--- a/.github/workflows/build-katsu.yml
+++ b/.github/workflows/build-katsu.yml
@@ -64,10 +64,10 @@ jobs:
           - plasma/base-disk
           - xfce/base-disk
           - ports/chromebook/sc7180/sc7180
-          - ports/chromebook/x86_64/flagship
-          - ports/chromebook/x86_64/gnome
-          - ports/chromebook/x86_64/kde
-          - ports/chromebook/x86_64/xfce
+          - ports/chromebook/flagship
+          - ports/chromebook/gnome
+          - ports/chromebook/plasma
+          - ports/chromebook/xfce
           # TODO: figure out how to get loop devices to work on our ARM runners
         exclude:
           - arch: aarch64
@@ -78,6 +78,16 @@ jobs:
             variant: plasma/plasma-chromebook
           - arch: aarch64
             variant: xfce/xfce-chromebook
+          - arch: aarch64
+            variant: ports/chromebook/flagship
+          - arch: aarch64
+            variant: ports/chromebook/plasma
+          - arch: aarch64
+            variant: ports/chromebook/gnome
+          - arch: aarch64
+            variant: ports/chromebook/xfce
+          - arch: x86_64
+            variant: ports/chromebook/sc7180/sc7180
     runs-on: ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'arm64' }}
     container:
       image: ghcr.io/terrapkg/builder:f41
diff --git a/katsu/modules/ports/chromebook/x86_64/flagship.yaml b/katsu/modules/ports/chromebook/flagship-x86_64.yaml
similarity index 100%
rename from katsu/modules/ports/chromebook/x86_64/flagship.yaml
rename to katsu/modules/ports/chromebook/flagship-x86_64.yaml
diff --git a/katsu/modules/ports/chromebook/x86_64/gnome.yaml b/katsu/modules/ports/chromebook/gnome-x86_64.yaml
similarity index 100%
rename from katsu/modules/ports/chromebook/x86_64/gnome.yaml
rename to katsu/modules/ports/chromebook/gnome-x86_64.yaml
diff --git a/katsu/modules/ports/chromebook/x86_64/kde.yaml b/katsu/modules/ports/chromebook/plasma-x86_64.yaml
similarity index 100%
rename from katsu/modules/ports/chromebook/x86_64/kde.yaml
rename to katsu/modules/ports/chromebook/plasma-x86_64.yaml
diff --git a/katsu/modules/ports/chromebook/x86_64/xfce.yaml b/katsu/modules/ports/chromebook/xfce-x86_64.yaml
similarity index 100%
rename from katsu/modules/ports/chromebook/x86_64/xfce.yaml
rename to katsu/modules/ports/chromebook/xfce-x86_64.yaml