diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c85a3989219e..513fb9dbd7c3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,8 +35,8 @@ jobs: include: - runner: ubuntu-24.04 system: x86_64-linux - builds: [shell, manual-nixos, lib-tests, tarball] - desc: shell, docs, lib, tarball + builds: [shell, manual-nixos, lib-tests, lib-tests-lix, tarball] + desc: shell, docs, lib, lib-lix, tarball - runner: ubuntu-24.04-arm system: aarch64-linux builds: [shell, manual-nixos, manual-nixpkgs] @@ -93,6 +93,10 @@ jobs: if: contains(matrix.builds, 'lib-tests') && !cancelled() run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A lib-tests + - name: Build lib tests (Lix) + if: contains(matrix.builds, 'lib-tests-lix') && !cancelled() + run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A lib-tests-lix + - name: Build tarball if: contains(matrix.builds, 'tarball') && !cancelled() run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A tarball diff --git a/ci/default.nix b/ci/default.nix index 06fa75bbc38f..cb5dee81b465 100644 --- a/ci/default.nix +++ b/ci/default.nix @@ -63,6 +63,13 @@ rec { # CI jobs lib-tests = import ../lib/tests/release.nix { inherit pkgs; }; + # The lib tests may assert on specific error messages which are + # implementation-defined. Run them under Lix too so that nixpkgs do not + # couple its tests too hard to specific wordings. + lib-tests-lix = import ../lib/tests/release.nix { + inherit pkgs; + nixVersions = [ pkgs.lix ]; + }; manual-nixos = (import ../nixos/release.nix { }).manual.${system} or null; manual-nixpkgs = (import ../doc { pkgs = docPkgs; }); nixpkgs-vet = pkgs.callPackage ./nixpkgs-vet.nix {