From 75a0411e4544eac6c51f08704fe5a26a8da04014 Mon Sep 17 00:00:00 2001 From: Sukant Hajra Date: Mon, 15 Jul 2024 03:45:13 -0500 Subject: [PATCH] CI: Break up build more --- .github/workflows/ci.yml | 4 ++-- build/overlay.nix | 4 +++- flake.nix | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b6d2745..7f4561b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ jobs: pkgs-linux: strategy: matrix: - infra: [nixpkgs, haskell-nix, shajra] + infra: [nixpkgs.lower, nixpkgs.middle, nixpkgs.upper, haskell-nix, shajra] name: "pkgs-linux: ${{ matrix.infra }}" runs-on: ubuntu-latest steps: @@ -34,7 +34,7 @@ jobs: pkgs-darwin: strategy: matrix: - infra: [nixpkgs, haskell-nix, shajra] + infra: [nixpkgs.lower, nixpkgs.middle, nixpkgs.upper, haskell-nix, shajra] name: "pkgs-darwin: ${{ matrix.infra }}" needs: [pkgs-linux] runs-on: macos-latest diff --git a/build/overlay.nix b/build/overlay.nix index 9b12fc2..023555d 100644 --- a/build/overlay.nix +++ b/build/overlay.nix @@ -115,7 +115,9 @@ let ci.prebuilt.nixpkgs.upper = joinForCi "prebuilt-nixpkgs" isUpper build.pkgs.nixpkgs.prebuilt; ci.prebuilt.haskell-nix = joinForCi "prebuilt-haskellnix" isAny build.pkgs.haskell-nix.prebuilt; ci.prebuilt.shajra = joinForCi "prebuilt-shajra" isAny build.pkgs.shajra.prebuilt; - ci.build.nixpkgs = joinForCi "build-nixpkgs" isAny build.pkgs.nixpkgs.build; + ci.build.nixpkgs.lower = joinForCi "build-nixpkgs" isLower build.pkgs.nixpkgs.build; + ci.build.nixpkgs.middle = joinForCi "build-nixpkgs" isMiddle build.pkgs.nixpkgs.build; + ci.build.nixpkgs.upper = joinForCi "build-nixpkgs" isUpper build.pkgs.nixpkgs.build; ci.build.haskell-nix = joinForCi "build-haskellnix" isAny build.pkgs.haskell-nix.build; ci.build.shajra = joinForCi "build-shajra" isAny build.pkgs.shajra.build; ci.all = joinForCi "all" isAny build.pkgs; diff --git a/flake.nix b/flake.nix index f8d9881..1dc5a66 100644 --- a/flake.nix +++ b/flake.nix @@ -51,7 +51,9 @@ checks.ci-prebuilt-nixpkgs-upper = build.shajra-provision.ci.prebuilt.nixpkgs.upper; checks.ci-prebuilt-haskellnix = build.shajra-provision.ci.prebuilt.haskell-nix; checks.ci-prebuilt-shajra = build.shajra-provision.ci.prebuilt.shajra; - checks.ci-build-nixpkgs = build.shajra-provision.ci.build.nixpkgs; + checks.ci-build-nixpkgs-lower = build.shajra-provision.ci.build.nixpkgs.lower; + checks.ci-build-nixpkgs-middle = build.shajra-provision.ci.build.nixpkgs.middle; + checks.ci-build-nixpkgs-upper = build.shajra-provision.ci.build.nixpkgs.upper; checks.ci-build-haskellnix = build.shajra-provision.ci.build.haskell-nix; checks.ci-build-shajra = build.shajra-provision.ci.build.shajra; packages.shajra-nixos-rebuild = pkgs-system.shajra-nixos-rebuild;