aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorpaulrbr-fl <43074087+paulrbr-fl@users.noreply.github.com>2020-04-02 11:28:07 +0200
committerGitHub <noreply@github.com>2020-04-02 11:28:07 +0200
commitd56bb3363b91d5511764c43c296c9a360ae5220b (patch)
tree169b63725c4b45a0dfa30adad8b159ebcb1d338a
parent4a071edf5737373df72fab0f31e58fdde3bab94f (diff)
parentc39d5d6f8ccb880a724cff59a27c87e2da0178dd (diff)
downloadclever-tools-nix-d56bb3363b91d5511764c43c296c9a360ae5220b.tar.gz
clever-tools-nix-d56bb3363b91d5511764c43c296c9a360ae5220b.tar.zst
clever-tools-nix-d56bb3363b91d5511764c43c296c9a360ae5220b.zip
Merge pull request #12 from paulrbr-fl/update-clever-tools
ci: make sure to check ALL versions during tests
-rw-r--r--.travis.yml5
-rw-r--r--README.md2
-rwxr-xr-xcheck.sh1
-rw-r--r--default.nix2
-rw-r--r--scripts/check.nix4
-rwxr-xr-xscripts/check.sh3
6 files changed, 12 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 8b81afc..d0550a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,9 @@
2language: nix 2language: nix
3 3
4script: 4script:
5 - nix-env -i -f default.nix -A latest 5 - nix-build --no-out-link scripts/check.nix
6 - ./check.sh . 6 - nix-env -i -f default.nix -A latest
7 - ./scripts/check.sh .
7 8
8notifications: 9notifications:
9 slack: fretlink:pTIylIN7zkwRFuL3aHERmsbB 10 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
16 16
17Then, 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. 17Then, 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.
18 18
19Finally, don't forget to update `check.sh` with the latest version number. 19Finally, 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 @@
1[ "$(clever --version)" == "1.6.3" ]
diff --git a/default.nix b/default.nix
index 19da98c..d07d6cf 100644
--- a/default.nix
+++ b/default.nix
@@ -37,7 +37,7 @@ in rec {
37 37
38 v1_6_2 = mkOlderVersion { 38 v1_6_2 = mkOlderVersion {
39 rev = "2d492a117cf31d1a4951ae9e9dcc5dd6ebeabaa2"; 39 rev = "2d492a117cf31d1a4951ae9e9dcc5dd6ebeabaa2";
40 sha256 = "00kmk1dxfs5d8qj74qj917gcssq0c1gm513wq4a7a4v5fm4zmirl"; 40 sha256 = "0k0848aik036j90myf0gqapb0qm4khkf5wxhs7yhppmnpv3xgz24";
41 }; 41 };
42 42
43 v1_6_3 = callPackage ./clever-tools {}; 43 v1_6_3 = callPackage ./clever-tools {};
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 @@
1with import <nixpkgs> {};
2
3# Check all versions
4lib.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 @@
1#!/usr/bin/env bash
2
3[ "$(clever --version)" = "1.6.3" ]