From 1b2125ada221fb6deaf9051a5ae763e657b85625 Mon Sep 17 00:00:00 2001 From: Tulili Date: Sat, 27 Apr 2024 23:29:22 -0300 Subject: [PATCH] fix: proper extension for all generated files --- .github/workflows/build.yml | 1 + generators/main.pkl | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a1ce92a..9997f96 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,6 +6,7 @@ on: # yamllint disable-line rule:truthy push: paths: - config/** + - generators/** - modules/** - .github/workflows/build.yml pull_request: diff --git a/generators/main.pkl b/generators/main.pkl index 3efca76..61a0aa6 100644 --- a/generators/main.pkl +++ b/generators/main.pkl @@ -35,10 +35,10 @@ const function genImage(base: String, nvidia: Boolean, fx: Boolean): recipes.Ima `base-image` = "\(meta.image.base)/\(base)\(if (nvidia) "-nvidia" else "-main")" `image-version` = "latest" modules = new Listing { - ...(bbmodules.genImportModule("\(meta.module_prefix)/shared", ".yaml", meta.modules.shared)) - ...?(if(nvidia) null else bbmodules.genImportModule("\(meta.module_prefix)/amd", ".yaml", meta.modules.amd)) - ...?(if(base == "silverblue") bbmodules.genImportModule("\(meta.module_prefix)/gnome", ".yaml", meta.modules.gnome) else bbmodules.genImportModule("\(meta.module_prefix)/plasma", ".yml", meta.modules.plasma)) - ...?(if(fx) bbmodules.genImportModule("\(meta.module_prefix)/fx", ".yaml", meta.modules.fx) else null) + ...(bbmodules.genImportModule("\(meta.module_prefix)/shared", filePrefix, meta.modules.shared)) + ...?(if(nvidia) null else bbmodules.genImportModule("\(meta.module_prefix)/amd", filePrefix, meta.modules.amd)) + ...?(if(base == "silverblue") bbmodules.genImportModule("\(meta.module_prefix)/gnome", filePrefix, meta.modules.gnome) else bbmodules.genImportModule("\(meta.module_prefix)/plasma", filePrefix, meta.modules.plasma)) + ...?(if(fx) bbmodules.genImportModule("\(meta.module_prefix)/fx", filePrefix, meta.modules.fx) else null) } }