From 5282a336a4cda925f1e1d213702c3c31e2b3bcee Mon Sep 17 00:00:00 2001 From: Matthew Bauer <mjbauer95@gmail.com> Date: Thu, 7 Jul 2016 19:18:42 +0000 Subject: [PATCH] travis: build manuals to verify that they work fixes #15109 --- .travis.yml | 5 ++--- maintainers/scripts/travis-nox-review-pr.sh | 20 ++++++++++++++++---- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index e3386d5a6c29..07e8006aa9ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,8 @@ matrix: - os: linux sudo: false script: - - ./maintainers/scripts/travis-nox-review-pr.sh verify - - ./maintainers/scripts/travis-nox-review-pr.sh check - - ./maintainers/scripts/travis-nox-review-pr.sh tarball + - ./maintainers/scripts/travis-nox-review-pr.sh nixpkgs-verify nixpkgs-manual nixpkgs-tarball + - ./maintainers/scripts/travis-nox-review-pr.sh nixos-options nixos-manual - os: linux sudo: required dist: trusty diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh index a992311436c5..35ac3d443048 100755 --- a/maintainers/scripts/travis-nox-review-pr.sh +++ b/maintainers/scripts/travis-nox-review-pr.sh @@ -8,20 +8,32 @@ while test -n "$1"; do case $1 in - verify) + nixpkgs-verify) echo "=== Verifying that nixpkgs evaluates..." nix-env --file $TRAVIS_BUILD_DIR --query --available --json > /dev/null ;; - check) + nixos-options) echo "=== Checking NixOS options" nix-build $TRAVIS_BUILD_DIR/nixos/release.nix --attr options --show-trace ;; - tarball) - echo "=== Checking tarball creation" + nixos-manual) + echo "=== Checking NixOS manuals" + + nix-build $TRAVIS_BUILD_DIR/nixos/release.nix --attr manual --show-trace + ;; + + nixpkgs-manual) + echo "=== Checking nixpkgs manuals" + + nix-build $TRAVIS_BUILD_DIR/pkgs/top-level/release.nix --attr manpages --show-trace + ;; + + nixpkgs-tarball) + echo "=== Checking nixpkgs tarball creation" nix-build $TRAVIS_BUILD_DIR/pkgs/top-level/release.nix --attr tarball --show-trace ;;