Upgrade travis to use a newer dapptools version and using the method …

…without cloning
makerdao · Jan 6, 2021 · cd62fd7 · cd62fd7
1 parent 36dab5c
commit cd62fd7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,9 +4,8 @@ language: nix
 nix: 2.3.6
 before_install:
   - nix-env -iA nixpkgs.cachix
+  - nix-env -f https://github.com/dapphub/dapptools/archive/master.tar.gz -iA solc-static-versions.solc_0_5_12
   - echo "trusted-users = root travis" | sudo tee -a /etc/nix/nix.conf && sudo pkill nix-daemon
   - cachix use maker
-  - git clone --recursive https://github.com/dapphub/dapptools $HOME/.dapp/dapptools
-  - nix-env -f https://github.com/makerdao/makerpkgs/tarball/master -iA dappPkgsVersions.hevm-0_42_0.dapp
 script:
-  - dapp --use solc:0.5.12 test
+  - nix-shell --pure --run 'dapp --use solc:0.5.12 test'
diff --git a/shell.nix b/shell.nix
@@ -0,0 +1,12 @@
+{ dappPkgs ? (
+    import (fetchTarball "https://github.com/makerdao/makerpkgs/tarball/master") {}
+  ).dappPkgsVersions.hevm-0_43_1
+}: with dappPkgs;
+
+mkShell {
+  buildInputs = [
+    (dapp.override {
+      solc = solc-static-versions.solc_0_5_12;
+    })
+  ];
+}