From 06792a00f82693667691713142a115bbd4b53a7d Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 26 Aug 2024 02:43:11 +0800 Subject: [PATCH 1/7] fix: strip `proj-data-*` from kde images --- katsu/modules/kde/kde.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/katsu/modules/kde/kde.yaml b/katsu/modules/kde/kde.yaml index 050c25f..ac80ed1 100644 --- a/katsu/modules/kde/kde.yaml +++ b/katsu/modules/kde/kde.yaml @@ -4,3 +4,5 @@ dnf: packages: #beta - still need to set up our own comps - "@ultramarine-kde-product-environment" + exclude: + - 'proj-data-*' From 7a1b1894a178b3d0560a6dc392fd3a08851d3666 Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 26 Aug 2024 14:09:14 +0800 Subject: [PATCH 2/7] fix(kde): also exclude ibus --- katsu/modules/kde/kde.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/katsu/modules/kde/kde.yaml b/katsu/modules/kde/kde.yaml index ac80ed1..645fc13 100644 --- a/katsu/modules/kde/kde.yaml +++ b/katsu/modules/kde/kde.yaml @@ -6,3 +6,4 @@ dnf: - "@ultramarine-kde-product-environment" exclude: - 'proj-data-*' + - 'ibus' From f7caa7e009762aeb0a66f256f06a8cbf48e51050 Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 26 Aug 2024 14:15:05 +0800 Subject: [PATCH 3/7] fix(kde): exclude every single ibus package --- katsu/modules/kde/kde.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/katsu/modules/kde/kde.yaml b/katsu/modules/kde/kde.yaml index 645fc13..e546da6 100644 --- a/katsu/modules/kde/kde.yaml +++ b/katsu/modules/kde/kde.yaml @@ -7,3 +7,4 @@ dnf: exclude: - 'proj-data-*' - 'ibus' + - 'ibus-*' From 4b8c91fa71cdef427c7b7c79a11e27aa6d9a9867 Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 26 Aug 2024 14:25:06 +0800 Subject: [PATCH 4/7] fix(kde): do not exclude ibus-libs --- katsu/modules/kde/kde.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/katsu/modules/kde/kde.yaml b/katsu/modules/kde/kde.yaml index e546da6..86d8b5d 100644 --- a/katsu/modules/kde/kde.yaml +++ b/katsu/modules/kde/kde.yaml @@ -6,5 +6,11 @@ dnf: - "@ultramarine-kde-product-environment" exclude: - 'proj-data-*' - - 'ibus' - - 'ibus-*' + - ibus + - ibus-mozc + - ibus-anthy + - ibus-qt + - ibus-m17n + - ibus-hangul + - ibus-libpinyin + - ibus-typing-booster From 7fc22b0c903f78428817348d8a773e8265477212 Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 26 Aug 2024 15:20:46 +0800 Subject: [PATCH 5/7] fix(ci): don't use large runners --- .github/workflows/build-katsu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-katsu.yml b/.github/workflows/build-katsu.yml index 79cf804..0367b72 100644 --- a/.github/workflows/build-katsu.yml +++ b/.github/workflows/build-katsu.yml @@ -136,7 +136,7 @@ jobs: - kde/kde-live #- pantheon/pantheon-live - xfce/xfce-live - runs-on: ${{ matrix.arch == 'x86_64' && matrix.variant == 'kde/kde-live' && 'x86-64-lg' || matrix.arch == 'x86_64' && 'ubuntu-latest' || 'arm64' }} + runs-on: ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'arm64' }} container: image: ghcr.io/terrapkg/builder:f41 # Pass /dev from host to container From 6b9b485c3c91942081aa7b4d2a631fc08d879946 Mon Sep 17 00:00:00 2001 From: madonuko Date: Thu, 19 Sep 2024 23:05:03 +0800 Subject: [PATCH 6/7] fix: speed up CI by keeping chroot --- .github/workflows/build-katsu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-katsu.yml b/.github/workflows/build-katsu.yml index 136f94f..3a28a65 100644 --- a/.github/workflows/build-katsu.yml +++ b/.github/workflows/build-katsu.yml @@ -171,7 +171,7 @@ jobs: rm -rf /etc/rpm/macros.image-language-conf chcon system_u:object_r:install_exec_t:s0 "$(which katsu)" pushd katsu - KATSU_LOG=trace katsu -v --output=iso "modules/${{ matrix.variant }}.yaml" + KATSU_KEEP_CHROOT=1 KATSU_LOG=trace katsu -v --output=iso "modules/${{ matrix.variant }}.yaml" # get the ISO name, and then append the arch # e.g. flagship-live.iso -> flagship-live-x86_64.iso From eb317bd9327cc87d47d9cf83f282f9335808cff4 Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 30 Sep 2024 15:01:33 +0800 Subject: [PATCH 7/7] fix(plasma): don't strip proj-data --- katsu/modules/plasma/plasma.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/katsu/modules/plasma/plasma.yaml b/katsu/modules/plasma/plasma.yaml index 69bb3b2..6f02714 100644 --- a/katsu/modules/plasma/plasma.yaml +++ b/katsu/modules/plasma/plasma.yaml @@ -5,7 +5,6 @@ dnf: #beta - still need to set up our own comps - "@ultramarine-plasma-product-environment" exclude: - - "proj-data-*" - ibus - ibus-mozc - ibus-anthy