about summary refs log tree commit diff
path: root/.travis.yml
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2017-05-20 13:57:49 +0200
committerRobin Gloster <mail@glob.in>2017-05-20 14:55:44 +0200
commitda9adb8fab40a3dd86d6cfcbd103657ca98e5a48 (patch)
tree25c6af6c8753a49d4774eb901d9696ccefa9d461 /.travis.yml
parent9beb44fb84fa579edcbdb9089facce25248bac02 (diff)
parentc9f3893451103c52e70566a5d043ab5e35014e6c (diff)
downloadnixlib-da9adb8fab40a3dd86d6cfcbd103657ca98e5a48.tar
nixlib-da9adb8fab40a3dd86d6cfcbd103657ca98e5a48.tar.gz
nixlib-da9adb8fab40a3dd86d6cfcbd103657ca98e5a48.tar.bz2
nixlib-da9adb8fab40a3dd86d6cfcbd103657ca98e5a48.tar.lz
nixlib-da9adb8fab40a3dd86d6cfcbd103657ca98e5a48.tar.xz
nixlib-da9adb8fab40a3dd86d6cfcbd103657ca98e5a48.tar.zst
nixlib-da9adb8fab40a3dd86d6cfcbd103657ca98e5a48.zip
Merge remote-tracking branch 'upstream/master' into gcc-6
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml13
1 files changed, 12 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 802af69834d0..2bd784ed30a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,14 @@
 language: nix
+sudo: true
+# 'sudo: false' == containers that start fast, but only get 4G ram;
+# 'sudo: true'  == VMs that start slow, but with 8G
+# ..as per:  https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments
+# Nixpkgs PR tests OOM with 4G: https://github.com/NixOS/nixpkgs/issues/24200
+
 matrix:
     include:
         - os: linux
-          sudo: false
+          sudo: required
           script:
               - ./maintainers/scripts/travis-nox-review-pr.sh nixpkgs-verify nixpkgs-manual nixpkgs-tarball nixpkgs-unstable
               - ./maintainers/scripts/travis-nox-review-pr.sh nixos-options nixos-manual
@@ -18,3 +24,8 @@ matrix:
 env:
     global:
         - GITHUB_TOKEN=5edaaf1017f691ed34e7f80878f8f5fbd071603f
+
+notifications:
+    email:
+        on_success: never
+        on_failure: change