Merge pull request #147 from CORAAL/userWorkflow

improve flake, workflow for test user configurations

Author: camini

.github/workflows/nix-build.yml

@@ -2,16 +2,13 @@ name: Build GLF-OS Configurations
 
 on:
   push:
-    branches:
-      - main
-      - dev
-    paths:
-      - '**/*.nix'  
+    branches: [main, dev]
+    paths: ['**/*.nix']
+
   pull_request:
-    branches:
-      - '**' 
-    paths:
-      - '**/*.nix'
+    branches: ['**'] 
+    paths: ['**/*.nix']
+
   workflow_dispatch:
 
 jobs:
@@ -25,7 +22,29 @@ jobs:
 
       - name: Build GLF
         run: nix run github:Mic92/nix-fast-build -- --no-nom  --skip-cached --systems 'x86_64-linux' -f .#nixosConfigurations.glf-installer.config.system.build.toplevel
+        continue-on-error: false
+
+  test-user-config:
+    name: Test User Configuration
+    runs-on: ubuntu-latest
+    needs: []
+    steps:
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v17
+      
+      - name: Build User Test Configuration
+        run: nix run github:Mic92/nix-fast-build -- --no-nom  --skip-cached --systems 'x86_64-linux' -f .#nixosConfigurations.user-test.config.system.build.toplevel
 
-      - name: Report Results
+  report:
+    name: Final Status
+    runs-on: ubuntu-latest
+    needs: [buildGLF-Configurations, test-user-config]
+    steps:
+      - name: Combine Results
         run: |
-          echo "✅ Build completed successfully."
+          echo "Build status:"
+          echo "- Installer: ${{ needs.buildGLF-Configurations.result }}"
+          echo "- Installer: ${{ contains(needs.*.result, 'success') && '✅' || '❌' }}"
+          echo "- User Config: ${{ needs.test-user-config.result }}"
+          echo "✅ Testing completed"
+        if: always()

flake.nix

@@ -15,19 +15,25 @@
       nixosModules = {
         default = import ./modules/default;
       };
+
+      baseModules = [
+        nixosModules.default
+        { nixpkgs.config = nixpkgsConfig; }
+      ];
+
     in
     {
       iso = self.nixosConfigurations."glf-installer".config.system.build.isoImage;
+      
       nixosConfigurations = {
+        # Configuration pour l'ISO d'installation avec Calamares
         "glf-installer" = nixpkgs.lib.nixosSystem {
           inherit system;
-          modules = [
+          modules = baseModules ++ [
             "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix"
             "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
-            nixosModules.default
             ./iso-cfg/configuration.nix
             {
-              nixpkgs.config = nixpkgsConfig;
               nixpkgs.overlays = [
                 (self: super: {
                   calamares-nixos-extensions = super.calamares-nixos-extensions.overrideAttrs (oldAttrs: {
@@ -64,7 +70,27 @@
             })
           ];
         };
+
+        # Configuration de test utilisateur simulée
+        "user-test" = nixpkgs.lib.nixosSystem {
+          inherit system;
+          modules = baseModules ++ [
+            {
+              boot.loader.grub = {
+                enable = true;
+                device = "/dev/sda";
+                useOSProber = true;
+              };
+
+              fileSystems."/" = {
+                device = "/dev/sda1";
+                fsType = "ext4";
+              };
+            }
+          ];
+        };
       };
+
       nixosModules = nixosModules;
     } // utils.lib.eachDefaultSystem (system: 
       let