public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos: limited support archs are not release-critical

Browse Source 
Lately failing i686 tests like firefox have been blocking channel
releases. We're still building the tests for systems with limited
support but won't delay a channel release if they fail.
This commit is contained in:
Franz Pletz 2017-10-14 20:51:47 +02:00
parent fcfeda5544
commit 874a3c033c
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/release-combined.nix
View File

@ -42,12 +42,11 @@ in rec {
name = "nixos-${nixos.channel.version}"; name = "nixos-${nixos.channel.version}";
meta = { meta = {
description = "Release-critical builds for the NixOS channel"; description = "Release-critical builds for the NixOS channel";
maintainers = [ pkgs.lib.maintainers.eelco ]; maintainers = with pkgs.lib.maintainers; [ eelco fpletz ];
}; };
constituents = constituents =
let let
all = x: map (system: x.${system}) all = x: map (system: x.${system}) supportedSystems;
(supportedSystems ++ limitedSupportedSystems);
in [ in [
nixos.channel nixos.channel
(all nixos.dummy) (all nixos.dummy)
@ -61,7 +60,7 @@ in rec {
nixos.tests.chromium nixos.tests.chromium
(all nixos.tests.firefox) (all nixos.tests.firefox)
(all nixos.tests.firewall) (all nixos.tests.firewall)
nixos.tests.gnome3.x86_64-linux # FIXME: i686-linux (all nixos.tests.gnome3)
nixos.tests.installer.zfsroot.x86_64-linux # ZFS is 64bit only nixos.tests.installer.zfsroot.x86_64-linux # ZFS is 64bit only
(all nixos.tests.installer.lvm) (all nixos.tests.installer.lvm)
(all nixos.tests.installer.luksroot) (all nixos.tests.installer.luksroot)
@ -80,9 +79,8 @@ in rec {
(all nixos.tests.boot.uefiCdrom) (all nixos.tests.boot.uefiCdrom)
(all nixos.tests.boot.uefiUsb) (all nixos.tests.boot.uefiUsb)
(all nixos.tests.boot-stage1) (all nixos.tests.boot-stage1)
nixos.tests.hibernate.x86_64-linux # i686 is flaky, see #23107 (all nixos.tests.hibernate)
nixos.tests.docker nixos.tests.docker
nixos.tests.docker-edge
(all nixos.tests.ecryptfs) (all nixos.tests.ecryptfs)
(all nixos.tests.env) (all nixos.tests.env)
(all nixos.tests.ipv6) (all nixos.tests.ipv6)
@ -93,7 +91,7 @@ in rec {
(all nixos.tests.keymap.dvp) (all nixos.tests.keymap.dvp)
(all nixos.tests.keymap.neo) (all nixos.tests.keymap.neo)
(all nixos.tests.keymap.qwertz) (all nixos.tests.keymap.qwertz)
nixos.tests.plasma5.x86_64-linux # avoid big build on i686 (all nixos.tests.plasma5)
#(all nixos.tests.lightdm) #(all nixos.tests.lightdm)
(all nixos.tests.login) (all nixos.tests.login)
(all nixos.tests.misc) (all nixos.tests.misc)