Merge pull request #125092 from domenkozar/tarball-check-supported-platforms

tarball: check systems based on the list of supported systems
This commit is contained in:
Eelco Dolstra 2021-06-02 14:31:55 +02:00 committed by GitHub
commit 11d5aa6c0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions

View file

@ -4,6 +4,7 @@
{ nixpkgs
, officialRelease
, supportedSystems
, pkgs ? import nixpkgs.outPath {}
, nix ? pkgs.nix
, lib-tests ? import ../../lib/tests/release.nix { inherit pkgs; }
@ -66,7 +67,7 @@ releaseTools.sourceTarball {
fi
# Check that all-packages.nix evaluates on a number of platforms without any warnings.
for platform in i686-linux x86_64-linux x86_64-darwin; do
for platform in ${pkgs.lib.concatStringsSep " " supportedSystems}; do
header "checking Nixpkgs on $platform"
nix-env -f . \

View file

@ -12,7 +12,7 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
{
tarball = import ./make-tarball.nix {
inherit nixpkgs;
inherit nixpkgs supportedSystems;
officialRelease = false;
};

View file

@ -28,7 +28,7 @@ let
supportDarwin = builtins.elem "x86_64-darwin" systemsWithAnySupport;
jobs =
{ tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; };
{ tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease supportedSystems; };
metrics = import ./metrics.nix { inherit pkgs nixpkgs; };