From c2aea748c38c4d0649b6b00dda71523dfeca2ff0 Mon Sep 17 00:00:00 2001 From: Paul B Date: Thu, 2 Apr 2020 10:12:12 +0200 Subject: ci: check ALL versions during tests --- .travis.yml | 5 +++-- README.md | 2 +- check.sh | 1 - scripts/check.nix | 4 ++++ scripts/check.sh | 3 +++ 5 files changed, 11 insertions(+), 4 deletions(-) delete mode 100755 check.sh create mode 100644 scripts/check.nix create mode 100755 scripts/check.sh diff --git a/.travis.yml b/.travis.yml index 8b81afc..d0550a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,9 @@ language: nix script: - - nix-env -i -f default.nix -A latest - - ./check.sh . + - nix-build --no-out-link scripts/check.nix + - nix-env -i -f default.nix -A latest + - ./scripts/check.sh . notifications: slack: fretlink:pTIylIN7zkwRFuL3aHERmsbB diff --git a/README.md b/README.md index 9d744f5..c4a13e7 100644 --- a/README.md +++ b/README.md @@ -16,4 +16,4 @@ Once you've done that, add a `mkOlderVersion` for the previous latest version. O Then, run `nix build`. It will give you the correct values for the hashes. Correct those, run it again and you'll see `result-` directories, one per version. Go ahead and make sure they all work. -Finally, don't forget to update `check.sh` with the latest version number. +Finally, don't forget to update `scripts/check.sh` with the latest version number. diff --git a/check.sh b/check.sh deleted file mode 100755 index 92faac7..0000000 --- a/check.sh +++ /dev/null @@ -1 +0,0 @@ -[ "$(clever --version)" == "1.6.3" ] diff --git a/scripts/check.nix b/scripts/check.nix new file mode 100644 index 0000000..1a344c6 --- /dev/null +++ b/scripts/check.nix @@ -0,0 +1,4 @@ +with import {}; + +# Check all versions +lib.collect lib.isDerivation (callPackage ../default.nix {}) diff --git a/scripts/check.sh b/scripts/check.sh new file mode 100755 index 0000000..ffef74b --- /dev/null +++ b/scripts/check.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +[ "$(clever --version)" = "1.6.3" ] -- cgit v1.2.3