diff --git a/.build.yml b/.build.yml index c7161f1..0f312c4 100644 --- a/.build.yml +++ b/.build.yml @@ -1,10 +1,21 @@ image: nixos/25.05 environment: NIX_CONFIG: "experimental-features = nix-command flakes" +secrets: + - a0a725d2-f640-4a64-b71c-021d2f3f8378 sources: - https://git.sr.ht/~alexdavid/jail.nix tasks: - - setup: "sudo ln -s /etc/zoneinfo/EST /etc/localtime" - - test-jail-nix: "cd jail.nix && nix run ./tests#runTests" - - check-format: "cd jail.nix && nix run ./tests#checkFmt" - - build-website: "cd jail.nix && nix build -L ./website#default" + - setup: | + sudo ln -s /etc/zoneinfo/EST /etc/localtime + nix-env -iA cachix -f https://cachix.org/api/v1/install + cachix use jailnix + cachix doctor + - build-pkgs: | + cd jail.nix + nix build --print-build-logs --out-link result-tests ./tests#all-for-ci + cachix push jailnix result-tests + nix build --print-build-logs --out-link result-website ./website#default + cachix push jailnix result-website + - run-tests: cd jail.nix && cachix watch-exec jailnix -- result-tests/run-tests/bin/run-tests + - check-fmt: cd jail.nix && result-tests/check-fmt/bin/check-fmt diff --git a/tests/flake.nix b/tests/flake.nix index bd09a5f..5cb8de6 100644 --- a/tests/flake.nix +++ b/tests/flake.nix @@ -13,45 +13,51 @@ (haskellPackages.ghc.withPackages (p: cabal2nix.buildInputs)) pkgs.cabal-install ]; - mkApp = name: runtimeInputs: script: { - type = "app"; - program = lib.getExe ( - pkgs.writeShellApplication { - inherit name runtimeInputs; - text = '' - if ! [ -e jail-nix-tests.cabal ]; then - if [ -e tests/jail-nix-tests.cabal ]; then - cd tests - else - echo "${name} must be called in repo root or tests directory" - exit 1 - fi + mkTestPackage = + name: runtimeInputs: script: + pkgs.writeShellApplication { + inherit name runtimeInputs; + text = '' + if ! [ -e jail-nix-tests.cabal ]; then + if [ -e tests/jail-nix-tests.cabal ]; then + cd tests + else + echo "${name} must be called in repo root or tests directory" + exit 1 fi - ${script} - ''; - } - ); - }; + fi + ${script} + ''; + }; in - { - apps.x86_64-linux.runTests = mkApp "run-all-jail-nix-tests" testDependencies '' - ${ - lib.pipe - { - jail-nix = ../.; - nixpkgs = nixpkgs; - } - [ - (lib.mapAttrsToList (name: path: "${name}=${path}")) - (lib.concatStringsSep " ") - (lib.toShellVar "NIX_PATH") - ] - } cabal run spec -- "$@" - ''; + rec { + packages.x86_64-linux = rec { + all-for-ci = pkgs.linkFarmFromDrvs "all-for-ci" [ + run-tests + check-fmt + fmt + devShells.x86_64-linux.default + ]; - apps.x86_64-linux.checkFmt = mkApp "check-fmt" [ pkgs.nixfmt-tree ] "treefmt --ci"; + run-tests = mkTestPackage "run-tests" testDependencies '' + ${ + lib.pipe + { + jail-nix = ../.; + nixpkgs = nixpkgs; + } + [ + (lib.mapAttrsToList (name: path: "${name}=${path}")) + (lib.concatStringsSep " ") + (lib.toShellVar "NIX_PATH") + ] + } cabal run spec -- "$@" + ''; - apps.x86_64-linux.fmt = mkApp "fmt" [ pkgs.nixfmt-tree ] "treefmt"; + check-fmt = mkTestPackage "check-fmt" [ pkgs.nixfmt-tree ] "treefmt --ci"; + + fmt = mkTestPackage "fmt" [ pkgs.nixfmt-tree ] "treefmt"; + }; devShells.x86_64-linux.default = pkgs.mkShell { buildInputs = testDependencies ++ [