Skip to content

Commit b2829bb

Browse files
committed
Fix hydra eval github action
1 parent c73c30e commit b2829bb

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.github/workflows/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ jobs:
163163
sed -i 's/ifdLevel = 3;/ifdLevel = 2;/' flake.nix
164164
./check-hydra.sh
165165
166-
hydra-ifdLevel-3-and-ghc-8-10:
166+
hydra-ifdLevel-3:
167167
runs-on: [self-hosted, linux]
168168
timeout-minutes: 30
169169
steps:

flake.nix

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,13 +284,14 @@
284284
traceHydraJobs (lib.recursiveUpdate flake (lib.optionalAttrs (ifdLevel > 2) {
285285
hydraJobs.nix-tools = pkgs.releaseTools.aggregate {
286286
name = "nix-tools";
287-
constituents = [
287+
constituents = (if runningHydraEvalTest then [] else [
288288
"aarch64-darwin.nix-tools.static.zipped.nix-tools-static"
289289
"x86_64-darwin.nix-tools.static.zipped.nix-tools-static"
290-
"x86_64-linux.nix-tools.static.zipped.nix-tools-static"
291-
"x86_64-linux.nix-tools.static.zipped.nix-tools-static-arm64"
292290
"aarch64-darwin.nix-tools.static.zipped.nix-tools-static-no-ifd"
293291
"x86_64-darwin.nix-tools.static.zipped.nix-tools-static-no-ifd"
292+
]) ++ [
293+
"x86_64-linux.nix-tools.static.zipped.nix-tools-static"
294+
"x86_64-linux.nix-tools.static.zipped.nix-tools-static-arm64"
294295
"x86_64-linux.nix-tools.static.zipped.nix-tools-static-no-ifd"
295296
"x86_64-linux.nix-tools.static.zipped.nix-tools-static-arm64-no-ifd"
296297
(writeText "gitrev" (self.rev or "0000000000000000000000000000000000000000"))

0 commit comments

Comments
 (0)