File tree Expand file tree Collapse file tree 3 files changed +37
-10
lines changed Expand file tree Collapse file tree 3 files changed +37
-10
lines changed Original file line number Diff line number Diff line change @@ -74,13 +74,39 @@ steps:
74
74
agents :
75
75
system : x86_64-linux
76
76
77
- - label : ' Check that jobset will evaluate in Hydra'
77
+ - label : ' Check that jobset will evaluate in Hydra at ifdLevel 0 and 1 '
78
78
command :
79
79
- nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
80
- - ./check-hydra.sh 0
81
- - ./check-hydra.sh 1
82
- - ./check-hydra.sh 2
83
- - ./check-hydra.sh 3
80
+ - ./check-hydra.sh --arg ifdLevel 0
81
+ - ./check-hydra.sh --arg ifdLevel 1
82
+ agents :
83
+ system : x86_64-linux
84
+
85
+ - label : ' Check that jobset will evaluate in Hydra at ifdLevel 2'
86
+ command :
87
+ - nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
88
+ - ./check-hydra.sh --arg ifdLevel 2
89
+ agents :
90
+ system : x86_64-linux
91
+
92
+ - label : ' Check that jobset will evaluate in Hydra at ifdLevel 3 and ghc 8.10'
93
+ command :
94
+ - nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
95
+ - ./check-hydra.sh --arg ifdLevel 3 --arg include 'x : __substring 0 6 x == "ghc810"'
96
+ agents :
97
+ system : x86_64-linux
98
+
99
+ - label : ' Check that jobset will evaluate in Hydra at ifdLevel 3 and ghc 9.2'
100
+ command :
101
+ - nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
102
+ - ./check-hydra.sh --arg ifdLevel 3 --arg include 'x : __substring 0 5 x == "ghc92"'
103
+ agents :
104
+ system : x86_64-linux
105
+
106
+ - label : ' Check that jobset will evaluate in Hydra at ifdLevel 3 and not (ghc 8.10 or ghc 9.2)'
107
+ command :
108
+ - nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
109
+ - ./check-hydra.sh --arg ifdLevel 3 --arg include 'x : !(__substring 0 6 x == "ghc810" || __substring 0 5 x == "ghc92")'
84
110
agents :
85
111
system : x86_64-linux
86
112
Original file line number Diff line number Diff line change 2
2
# on a machine with e.g. no way to build the Darwin IFDs you need!
3
3
{ supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ]
4
4
, ifdLevel ? 3
5
+ , include ? ( compiler-nix-name : true )
5
6
, checkMaterialization ? false } :
6
7
7
8
let
16
17
lib = genericPkgs . lib ;
17
18
ci = import ./ci.nix { inherit supportedSystems ifdLevel checkMaterialization ; restrictEval = true ; } ;
18
19
allJobs = stripAttrsForHydra ( filterDerivations ci ) ;
19
- latestJobs = {
20
+ latestJobs = lib . optionalAttrs ( include "ghc8107" ) {
20
21
# All the jobs are included in the `requiredJobs`, but the ones
21
22
# added here will also included without aggregation, making it easier
22
23
# to find a failing test. Keep in mind though that adding too many
32
33
let nixpkgsJobs = allJobs . ${ nixpkgsVer } ;
33
34
in lib . concatMap ( compiler-nix-name :
34
35
let ghcJobs = nixpkgsJobs . ${ compiler-nix-name } ;
35
- in builtins . concatMap ( platform :
36
+ in lib . optionals ( include compiler-nix-name ) ( builtins . concatMap ( platform :
36
37
let platformJobs = ghcJobs . ${ platform } ;
37
38
in builtins . map ( crossPlatform : {
38
39
name = "required-${ nixpkgsVer } -${ compiler-nix-name } -${ platform } -${ crossPlatform } " ;
42
43
constituents = lib . collect ( d : lib . isDerivation d ) platformJobs . ${ crossPlatform } ;
43
44
} ;
44
45
} ) ( names platformJobs )
45
- ) ( names ghcJobs )
46
+ ) ( names ghcJobs ) )
46
47
) ( names nixpkgsJobs )
47
48
) ( names allJobs ) ) ;
48
49
in traceNames "job " ( latestJobs // requiredJobs // {
Original file line number Diff line number Diff line change @@ -10,12 +10,12 @@ writeScript "check-hydra.sh" ''
10
10
export PATH="${ makeBinPath [ coreutils time gnutar gzip hydra-unstable jq gitMinimal ] } "
11
11
export NIX_PATH=
12
12
13
- echo '~~~ Evaluating release.nix with --arg ifdLevel '$1
13
+ echo '~~~ Evaluating release.nix with' "$@"
14
14
command time --format '%e' -o eval-time.txt \
15
15
hydra-eval-jobs \
16
16
--option allowed-uris "https://github.com/NixOS https://github.com/input-output-hk" \
17
17
--arg supportedSystems '[ builtins.currentSystem ]' \
18
- --arg ifdLevel $1 \
18
+ "$@" \
19
19
-I $(realpath .) release.nix > eval.json
20
20
EVAL_EXIT_CODE="$?"
21
21
if [ "$EVAL_EXIT_CODE" != 0 ]
You can’t perform that action at this time.
0 commit comments