summaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorAntoine Eiche <lewo@abesis.fr>2020-04-19 14:48:01 +0200
committerAntoine Eiche <lewo@abesis.fr>2020-04-22 23:35:48 +0200
commitb5263680a40bd3120ed4a9b8df653bc6b9c8b3d9 (patch)
tree819de7865598ad5e24e92cd03751da47c2aaa31b /.gitlab-ci.yml
parent493afb5f9a65fdd3b0bf51e5c9ddfabaec7c9f08 (diff)
Check the Hydra master jobset as well
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml9
1 files changed, 8 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 437bfe9..d26b583 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,13 @@
-hydra:
+hydra-pr:
only:
- merge_requests
image: nixos/nix
script:
- nix run -f channel:nixos-unstable hydra-cli -c hydra-cli -H https://hydra.nix-community.org jobset-wait simple-nixos-mailserver $CI_MERGE_REQUEST_IID
+
+hydra-master:
+ only:
+ - master
+ image: nixos/nix
+ script:
+ - nix run -f channel:nixos-unstable hydra-cli -c hydra-cli -H https://hydra.nix-community.org jobset-wait simple-nixos-mailserver master