Merge pull request #153718 from pacien/mercurial-6.0-extend-timeout
mercurial: attempt to fix build on Hydra (extend timeout and add CA bundle)
This commit is contained in:
commit
8e0f7fd8e3
1 changed files with 3 additions and 1 deletions
|
@ -11,6 +11,7 @@
|
|||
, which
|
||||
, sqlite
|
||||
, git
|
||||
, cacert
|
||||
, gnupg
|
||||
}:
|
||||
|
||||
|
@ -70,6 +71,7 @@ let
|
|||
git
|
||||
gnupg
|
||||
];
|
||||
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; # needed for git
|
||||
checkPhase = ''
|
||||
cat << EOF > tests/blacklists/nix
|
||||
# tests enforcing "/usr/bin/env" shebangs, which are patched for nix
|
||||
|
@ -78,7 +80,7 @@ let
|
|||
EOF
|
||||
|
||||
# extended timeout necessary for tests to pass on the busy CI workers
|
||||
export HGTESTFLAGS="--blacklist blacklists/nix --timeout 600"
|
||||
export HGTESTFLAGS="--blacklist blacklists/nix --timeout 1800"
|
||||
make check
|
||||
'';
|
||||
|
||||
|
|
Loading…
Reference in a new issue