From 67c44decc8605262605a9f2ac2c936706781e7d4 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Fri, 24 Mar 2017 01:39:45 +0300 Subject: [PATCH 1/2] travis: sudo: true, to gain 4G of RAM, as per @domenkozar suggestion to fix #24200 --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index bed82810d46..7474cce7272 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,10 @@ 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 From 8d97ee2a97f7a588c731733bf84f398c8f74f96f Mon Sep 17 00:00:00 2001 From: Kosyrev Serge Date: Fri, 24 Mar 2017 16:38:42 +0000 Subject: [PATCH 2/2] Fix a missed `sudo: true` line --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7474cce7272..2bd784ed30a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ sudo: true 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