From 941f48bd81442f9af1168be638aac44c2f20d93b Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 27 Jan 2023 23:44:41 -0700 Subject: [PATCH] flake.nix: Add checks for integration tests --- .github/workflows/build.yml | 2 +- flake.nix | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 63c5978..56df32a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: name: colmena authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - run: nix flake check + - run: nix flake check --no-build if: ${{ !contains(matrix.nix.version, '2.3') && runner.os != 'macOS' }} - name: Build Colmena diff --git a/flake.nix b/flake.nix index f0e0221..3ccfe15 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ }; }; - outputs = { self, nixpkgs, flake-utils, ... }: let + outputs = { self, nixpkgs, stable, flake-utils, ... } @ inputs: let supportedSystems = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; colmenaOptions = import ./src/nix/hive/options.nix; colmenaModules = import ./src/nix/hive/modules.nix; @@ -79,8 +79,23 @@ python3 python3Packages.flake8 ]; }; + checks = let + inputsOverlay = final: prev: { + _inputs = inputs; + }; + in if pkgs.stdenv.isLinux then import ./integration-tests { + pkgs = import nixpkgs { + inherit system; + overlays = [ self.overlays.default inputsOverlay ]; + }; + pkgsStable = import stable { + inherit system; + overlays = [ self.overlays.default inputsOverlay ]; + }; + } else {}; }) // { - overlay = final: prev: { + overlay = self.overlays.default; + overlays.default = final: prev: { colmena = final.callPackage ./package.nix { }; }; nixosModules = {