Skip to content

Commit c73c30e

Browse files
committed
Skip darwin when testing hydra eval in github action
1 parent a479589 commit c73c30e

File tree

2 files changed

+9
-22
lines changed

2 files changed

+9
-22
lines changed

.github/workflows/pipeline.yml

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,10 @@ jobs:
145145
- name: "Check that jobset will evaluate in Hydra at ifdLevel 0 and 1"
146146
run: |
147147
nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
148-
sed -i 's/ifdLevel = 3/ifdLevel = 0/' flake.nix
148+
sed -i 's/runningHydraEvalTest = false;/runningHydraEvalTest = true;/' flake.nix
149+
sed -i 's/ifdLevel = 3;/ifdLevel = 0;/' flake.nix
149150
./check-hydra.sh
150-
sed -i 's/ifdLevel = 0/ifdLevel = 1/' flake.nix
151+
sed -i 's/ifdLevel = 0;/ifdLevel = 1;/' flake.nix
151152
./check-hydra.sh
152153
153154
hydra-ifdLevel-2:
@@ -158,7 +159,8 @@ jobs:
158159
- name: "Check that jobset will evaluate in Hydra at ifdLevel 2"
159160
run: |
160161
nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
161-
sed -i 's/ifdLevel = 3/ifdLevel = 2/' flake.nix
162+
sed -i 's/runningHydraEvalTest = false;/runningHydraEvalTest = true;/' flake.nix
163+
sed -i 's/ifdLevel = 3;/ifdLevel = 2;/' flake.nix
162164
./check-hydra.sh
163165
164166
hydra-ifdLevel-3-and-ghc-8-10:
@@ -169,26 +171,9 @@ jobs:
169171
- name: "Check that jobset will evaluate in Hydra at ifdLevel 3"
170172
run: |
171173
nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
174+
sed -i 's/runningHydraEvalTest = false;/runningHydraEvalTest = true;/' flake.nix
172175
./check-hydra.sh
173176
174-
hydra-ifdLevel-3-and-ghc-9-2:
175-
runs-on: [self-hosted, linux]
176-
steps:
177-
- uses: actions/checkout@v4
178-
- name: "Check that jobset will evaluate in Hydra at ifdLevel 3 and ghc 9.2"
179-
run: |
180-
nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
181-
./check-hydra.sh --arg ifdLevel 3 --arg include 'x: __substring 0 5 x == "ghc92"'
182-
183-
hydra-ifdLevel-3-and-not-ghc-8-10-or-9-2:
184-
runs-on: [self-hosted, linux]
185-
steps:
186-
- uses: actions/checkout@v4
187-
- name: "Check that jobset will evaluate in Hydra at ifdLevel 3 and not (ghc 8.10 or ghc 9.2)"
188-
run: |
189-
nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
190-
./check-hydra.sh --arg ifdLevel 3 --arg include 'x: !(__substring 0 6 x == "ghc810" || __substring 0 5 x == "ghc92")'
191-
192177
closure-size:
193178
runs-on: [self-hosted, linux]
194179
steps:

flake.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
callFlake = import flake-compat;
9292

9393
ifdLevel = 3;
94+
runningHydraEvalTest = false;
9495
compiler = "ghc928";
9596
config = import ./config.nix;
9697

@@ -108,9 +109,10 @@
108109
# systems supported by haskell.nix
109110
systems = [
110111
"x86_64-linux"
112+
] ++ (if runningHydraEvalTest then [] else [
111113
"x86_64-darwin"
112114
"aarch64-darwin"
113-
];
115+
]);
114116

115117
nixpkgsArgs = {
116118
inherit config;

0 commit comments

Comments
 (0)