summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Purcell <steve@sanityinc.com>2019-10-06 17:14:43 +1300
committerSteve Purcell <steve@sanityinc.com>2019-10-07 10:04:36 +1300
commitd97b03d741323bd231d88c7d049446da270f9160 (patch)
treec304f72bccf76817a3dcccb32b90a845a7ed1197
parent4f6e746994362197fc8fe28357ac0e98de340e7f (diff)
Just invoke nix-env directly from travis command
-rw-r--r--.travis.yml3
-rwxr-xr-xtools/install-ledger.sh19
2 files changed, 2 insertions, 20 deletions
diff --git a/.travis.yml b/.travis.yml
index 4523b9d..05b3701 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,8 @@ matrix:
install:
- bash <(curl https://raw.githubusercontent.com/purcell/nix-emacs-ci/master/travis-install)
- - tools/install-ledger.sh $LEDGER_VERSION
+ # TODO: cache builds of this using cachix
+ - nix-env -iA $LEDGER_VERSION -f tools
script:
- emacs --version
diff --git a/tools/install-ledger.sh b/tools/install-ledger.sh
deleted file mode 100755
index cc6bab3..0000000
--- a/tools/install-ledger.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu -o pipefail
-set -o xtrace
-
-VERSION=$1
-THISDIR=$(cd "$(dirname "$0")" && pwd)
-
-case "$VERSION" in
- stable)
- nix-env -iA stable -f $THISDIR/default.nix
- ;;
- snapshot)
- nix-env -iA snapshot -f $THISDIR/default.nix
- ;;
- *)
- echo "$0: Unknown branch: $VERSION"
- ;;
-esac