From be22172a359f3bd9b922336fb76fde75b604af9b Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Sat, 4 Mar 2023 16:43:26 +0200 Subject: [PATCH] Nix: simplify CI --- .github/workflows/nix-build.yaml | 11 ++--------- flake.nix | 4 ++++ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/nix-build.yaml b/.github/workflows/nix-build.yaml index ccbef78f..5e911a38 100644 --- a/.github/workflows/nix-build.yaml +++ b/.github/workflows/nix-build.yaml @@ -5,13 +5,6 @@ jobs: nix: name: "Build Hyprland (Nix)" runs-on: ubuntu-latest - strategy: - matrix: - package: - - default - - hyprland-no-hidpi - - hyprland-nvidia - - xdg-desktop-portal-hyprland steps: - name: Clone repository uses: actions/checkout@v3 @@ -29,5 +22,5 @@ jobs: with: name: hyprland authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - name: Build Hyprland with default settings - run: nix build .#${{ matrix.package }} --print-build-logs + - name: Build packages + run: nix flake check --print-build-logs --accept-flake-config diff --git a/flake.nix b/flake.nix index 269bd41e..f2a08dc0 100644 --- a/flake.nix +++ b/flake.nix @@ -101,6 +101,10 @@ }; }; + checks = genSystems (system: + (lib.filterAttrs (n: _: (lib.hasPrefix "hyprland" n) && !(lib.hasSuffix "debug" n)) self.packages.${system}) + // {inherit (self.packages.${system}) xdg-desktop-portal-hyprland;}); + packages = genSystems (system: (self.overlays.default null pkgsFor.${system}) // {